From: Stefan Monnier Date: Wed, 26 Oct 2011 17:27:51 +0000 (-0400) Subject: * lisp/gnus/message.el: Don't insert TAB in headers with completion. X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~1845 X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=8a410c7d5ef68b20e75734d9e6ea6d5f1f734869;p=emacs.git * lisp/gnus/message.el: Don't insert TAB in headers with completion. (message-completion-function): Don't fallback on message-tab-body-function when message-completion-alist fails to find a completion. --- diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 2dd22c2383b..9d4053f5bbf 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,3 +1,9 @@ +2011-10-26 Stefan Monnier + + * message.el (message-completion-function): Make sure + message-tab-body-function is not attempted if one of + message-completion-alist fails to find a completion (bug#9158). + 2011-10-26 Daiki Ueno * mml.el (mml-quote-region): Quote <#secure> tag. @@ -7,7 +13,7 @@ * gnus-cite.el (gnus-message-citation-mode): Doc fix (in Emacs 24, calling a minor mode from Lisp with nil arg enables it, so we have to - make the working a bit ambiguous here). + make the wording a bit ambiguous here). 2011-10-18 Teodor Zlatanov diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el index 948892d1e13..723f8fb72b5 100644 --- a/lisp/gnus/message.el +++ b/lisp/gnus/message.el @@ -7888,7 +7888,11 @@ those headers." (let ((mail-abbrev-mode-regexp (caar alist))) (not (mail-abbrev-in-expansion-header-p)))) (setq alist (cdr alist))) - (cdar alist))) + (when (cdar alist) + (lexical-let ((fun (cdar alist))) + ;; Even if completion fails, return a non-nil value, so as to avoid + ;; falling back to message-tab-body-function. + (lambda () (funcall fun) 'completion-attempted))))) (eval-and-compile (condition-case nil